* xdisp.c: Rename or move local decls to avoid shadowing.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Mar 2011 08:31:32 +0000 (00:31 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Mar 2011 08:31:32 +0000 (00:31 -0800)
Also:
(BUILD_GLYPHLESS_GLYPH_STRING): Omit unused local var.
(produce_glyphless_glyph): Make a pointer "const".
(update_window_cursor):  Now static, since it's not used elsewhere.
(SKIP_GLYPHS): Removed unused macro.


Trivial merge